sync with main repo

RetailCoder.VBE/Inspections/QuickFixes/EncapsulateFieldQuickFix.cs

@@ -6,7 +6,7 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.EncapsulateField;
 using Rubberduck.SmartIndenter;
-using Rubberduck.UI.Refactorings;
+using Rubberduck.UI.Refactorings.EncapsulateField;
 using Rubberduck.VBEditor;
 
 namespace Rubberduck.Inspections.QuickFixes
@@ -32,7 +32,7 @@ public override void Fix()
         {
             var vbe = _target.Project.VBE;
 
-            using (var view = new EncapsulateFieldDialog(_state, _indenter))
+            using (var view = new EncapsulateFieldDialog(new EncapsulateFieldViewModel(_state, _indenter)))
             {
                 var factory = new EncapsulateFieldPresenterFactory(vbe, _state, view);
                 var refactoring = new EncapsulateFieldRefactoring(vbe, _indenter, factory);

RetailCoder.VBE/Refactorings/EncapsulateField/EncapsulateFieldPresenter.cs

@@ -4,6 +4,8 @@
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.UI.Refactorings;
+using Rubberduck.UI.Refactorings.EncapsulateField;
 
 namespace Rubberduck.Refactorings.EncapsulateField
 {
@@ -14,10 +16,10 @@ public interface IEncapsulateFieldPresenter
 
     public class EncapsulateFieldPresenter : IEncapsulateFieldPresenter
     {
-        private readonly IEncapsulateFieldDialog _view;
+        private readonly IRefactoringDialog<EncapsulateFieldViewModel> _view;
         private readonly EncapsulateFieldModel _model;
 
-        public EncapsulateFieldPresenter(IEncapsulateFieldDialog view, EncapsulateFieldModel model)
+        public EncapsulateFieldPresenter(IRefactoringDialog<EncapsulateFieldViewModel> view, EncapsulateFieldModel model)
         {
             _view = view;
             _model = model;
@@ -27,13 +29,31 @@ public EncapsulateFieldModel Show()
         {
             if (_model.TargetDeclaration == null) { return null; }
 
-            _view.TargetDeclaration = _model.TargetDeclaration;
-            _view.NewPropertyName = _model.TargetDeclaration.IdentifierName;
+            _view.ViewModel.TargetDeclaration = _model.TargetDeclaration;
 
             var isVariant = _model.TargetDeclaration.AsTypeName.Equals(Tokens.Variant);
             var isValueType = !isVariant && (SymbolList.ValueTypes.Contains(_model.TargetDeclaration.AsTypeName) ||
                               _model.TargetDeclaration.DeclarationType == DeclarationType.Enumeration);
 
+            AssignSetterAndLetterAvailability(isVariant, isValueType);
+
+            _view.ShowDialog();
+            if (_view.DialogResult != DialogResult.OK)
+            {
+                return null;
+            }
+
+            _model.PropertyName = _view.ViewModel.PropertyName;
+            _model.ImplementLetSetterType = _view.ViewModel.CanHaveLet;
+            _model.ImplementSetSetterType = _view.ViewModel.CanHaveSet;
+            _model.CanImplementLet = _view.ViewModel.CanHaveSet && !_view.ViewModel.CanHaveSet;
+
+            _model.ParameterName = _view.ViewModel.ParameterName;
+            return _model;
+        }
+
+        private void AssignSetterAndLetterAvailability(bool isVariant, bool isValueType)
+        {
             if (_model.TargetDeclaration.References.Any(r => r.IsAssignment))
             {
                 if (isVariant)
@@ -46,51 +66,38 @@ public EncapsulateFieldModel Show()
 
                     if (node is VBAParser.LetStmtContext)
                     {
-                        _view.CanImplementLetSetterType = true;
+                        _view.ViewModel.CanHaveLet = true;
                     }
                     else
                     {
-                        _view.CanImplementSetSetterType = true;
-                    }                    
+                        _view.ViewModel.CanHaveSet = true;
+                    }
                 }
                 else if (isValueType)
                 {
-                    _view.CanImplementLetSetterType = true;
+                    _view.ViewModel.CanHaveLet = true;
                 }
                 else
                 {
-                    _view.CanImplementSetSetterType = true;
+                    _view.ViewModel.CanHaveSet = true;
                 }
             }
             else
             {
                 if (isValueType)
                 {
-                    _view.CanImplementLetSetterType = true;
+                    _view.ViewModel.CanHaveLet = true;
                 }
                 else if (!isVariant)
                 {
-                    _view.CanImplementSetSetterType = true;
+                    _view.ViewModel.CanHaveSet = true;
                 }
                 else
                 {
-                    _view.CanImplementLetSetterType = true;
-                    _view.CanImplementSetSetterType = true;
+                    _view.ViewModel.CanHaveLet = true;
+                    _view.ViewModel.CanHaveSet = true;
                 }
             }
-
-            if (_view.ShowDialog() != DialogResult.OK)
-            {
-                return null;
-            }
-
-            _model.PropertyName = _view.NewPropertyName;
-            _model.ImplementLetSetterType = _view.CanImplementLetSetterType;
-            _model.ImplementSetSetterType = _view.CanImplementSetSetterType;
-            _model.CanImplementLet = !_view.MustImplementSetSetterType;
-
-            _model.ParameterName = _view.ParameterName;
-            return _model;
         }
     }
 }

RetailCoder.VBE/Refactorings/EncapsulateField/EncapsulateFieldPresenterFactory.cs

@@ -1,15 +1,17 @@
 using Rubberduck.Parsing.VBA;
+using Rubberduck.UI.Refactorings;
+using Rubberduck.UI.Refactorings.EncapsulateField;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Refactorings.EncapsulateField
 {
     public class EncapsulateFieldPresenterFactory : IRefactoringPresenterFactory<EncapsulateFieldPresenter>
     {
         private readonly IVBE _vbe;
-        private readonly IEncapsulateFieldDialog _view;
+        private readonly IRefactoringDialog<EncapsulateFieldViewModel> _view;
         private readonly RubberduckParserState _state;
 
-        public EncapsulateFieldPresenterFactory(IVBE vbe, RubberduckParserState state, IEncapsulateFieldDialog view)
+        public EncapsulateFieldPresenterFactory(IVBE vbe, RubberduckParserState state, IRefactoringDialog<EncapsulateFieldViewModel> view)
         {
             _vbe = vbe;
             _view = view;

RetailCoder.VBE/Refactorings/EncapsulateField/PropertyGenerator.cs

@@ -11,15 +11,9 @@ public class PropertyGenerator
         public bool GenerateLetter { get; set; }
         public bool GenerateSetter { get; set; }
 
-        public string AllPropertyCode
-        {
-            get
-            {
-                return GetterCode +
-                        (GenerateLetter ? LetterCode : string.Empty) +
-                        (GenerateSetter ? SetterCode : string.Empty);
-            }
-        }
+        public string AllPropertyCode => GetterCode +
+                                         (GenerateLetter ? LetterCode : string.Empty) +
+                                         (GenerateSetter ? SetterCode : string.Empty);
 
         public string GetterCode
         {
@@ -28,21 +22,21 @@ public string GetterCode
                 if (GenerateSetter && GenerateLetter)
                 {
                     return string.Join(Environment.NewLine,
-                        string.Format("Public Property Get {0}() As {1}", PropertyName, AsTypeName),
-                        string.Format("    If IsObject({0}) Then", BackingField),
-                        string.Format("        Set {0} = {1}", PropertyName, BackingField),
-                                      "    Else",
-                        string.Format("        {0} = {1}", PropertyName, BackingField),
-                                      "    End If",
-                                      "End Property",
-                                      Environment.NewLine);
+                                       $"Public Property Get {PropertyName}() As {AsTypeName}",
+                                       $"    If IsObject({BackingField}) Then",
+                                       $"        Set {PropertyName} = {BackingField}",
+                                       "    Else",
+                                       $"        {PropertyName} = {BackingField}",
+                                       "    End If",
+                                       "End Property",
+                                       Environment.NewLine);
                 }
 
                 return string.Join(Environment.NewLine,
-                    string.Format("Public Property Get {0}() As {1}", PropertyName, AsTypeName),
-                    string.Format("    {0}{1} = {2}", GenerateSetter ? "Set " : string.Empty, PropertyName, BackingField),
-                                  "End Property",
-                                  Environment.NewLine);
+                                   $"Public Property Get {PropertyName}() As {AsTypeName}",
+                                   $"    {(GenerateSetter ? "Set " : string.Empty)}{PropertyName} = {BackingField}",
+                                   "End Property",
+                                   Environment.NewLine);
             }
         }
 
@@ -55,10 +49,10 @@ public string SetterCode
                     return string.Empty;
                 }
                 return string.Join(Environment.NewLine,
-                    string.Format("Public Property Set {0}(ByVal {1} As {2})", PropertyName, ParameterName, AsTypeName),
-                    string.Format("    Set {0} = {1}", BackingField, ParameterName),
-                                  "End Property",
-                                  Environment.NewLine);
+                                   $"Public Property Set {PropertyName}(ByVal {ParameterName} As {AsTypeName})",
+                                   $"    Set {BackingField} = {ParameterName}",
+                                   "End Property",
+                                   Environment.NewLine);
             }
         }
 
@@ -71,10 +65,10 @@ public string LetterCode
                     return string.Empty;
                 }
                 return string.Join(Environment.NewLine,
-                    string.Format("Public Property Let {0}(ByVal {1} As {2})", PropertyName, ParameterName, AsTypeName),
-                    string.Format("    {0} = {1}", BackingField, ParameterName),
-                                  "End Property",
-                                  Environment.NewLine);
+                                   $"Public Property Let {PropertyName}(ByVal {ParameterName} As {AsTypeName})",
+                                   $"    {BackingField} = {ParameterName}",
+                                   "End Property",
+                                   Environment.NewLine);
             }
         }
     }

RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfaceModel.cs

@@ -54,7 +54,7 @@ public ExtractInterfaceModel(RubberduckParserState state, QualifiedSelection sel
                                                   && MemberTypes.Contains(item.DeclarationType))
                                    .OrderBy(o => o.Selection.StartLine)
                                    .ThenBy(t => t.Selection.StartColumn)
-                                   .Select(d => new InterfaceMember(d, declarations))
+                                   .Select(d => new InterfaceMember(d))
                                    .ToList();
         }
     }

RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfacePresenter.cs

@@ -1,5 +1,7 @@
 using System.Linq;
 using System.Windows.Forms;
+using Rubberduck.UI.Refactorings;
+using Rubberduck.UI.Refactorings.ExtractInterface;
 
 namespace Rubberduck.Refactorings.ExtractInterface
 {
@@ -10,10 +12,10 @@ public interface IExtractInterfacePresenter
 
     public class ExtractInterfacePresenter : IExtractInterfacePresenter
     {
-        private readonly IExtractInterfaceDialog _view;
+        private readonly IRefactoringDialog<ExtractInterfaceViewModel> _view;
         private readonly ExtractInterfaceModel _model;
 
-        public ExtractInterfacePresenter(IExtractInterfaceDialog view, ExtractInterfaceModel model)
+        public ExtractInterfacePresenter(IRefactoringDialog<ExtractInterfaceViewModel> view, ExtractInterfaceModel model)
         {
             _view = view;
             _model = model;
@@ -26,18 +28,18 @@ public ExtractInterfaceModel Show()
                 return null;
             }
 
-            _view.ComponentNames =
-                _model.TargetDeclaration.Project.VBComponents.Select(c => c.Name).ToList();
-            _view.InterfaceName = _model.InterfaceName;
-            _view.Members = _model.Members;
+            _view.ViewModel.ComponentNames = _model.TargetDeclaration.Project.VBComponents.Select(c => c.Name).ToList();
+            _view.ViewModel.InterfaceName = _model.InterfaceName;
+            _view.ViewModel.Members = _model.Members.ToList();
 
-            if (_view.ShowDialog() != DialogResult.OK)
+            _view.ShowDialog();
+            if (_view.DialogResult != DialogResult.OK)
             {
                 return null;
             }
 
-            _model.InterfaceName = _view.InterfaceName;
-            _model.Members = _view.Members;
+            _model.InterfaceName = _view.ViewModel.InterfaceName;
+            _model.Members = _view.ViewModel.Members;
             return _model;
         }
     }

RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfacePresenterFactory.cs

@@ -1,16 +1,18 @@
 using System.Linq;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.UI.Refactorings;
+using Rubberduck.UI.Refactorings.ExtractInterface;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Refactorings.ExtractInterface
 {
     public class ExtractInterfacePresenterFactory : IRefactoringPresenterFactory<ExtractInterfacePresenter>
     {
         private readonly IVBE _vbe;
-        private readonly IExtractInterfaceDialog _view;
+        private readonly IRefactoringDialog<ExtractInterfaceViewModel> _view;
         private readonly RubberduckParserState _state;
 
-        public ExtractInterfacePresenterFactory(IVBE vbe, RubberduckParserState state, IExtractInterfaceDialog view)
+        public ExtractInterfacePresenterFactory(IVBE vbe, RubberduckParserState state, IRefactoringDialog<ExtractInterfaceViewModel> view)
         {
             _vbe = vbe;
             _view = view;

RetailCoder.VBE/Refactorings/ExtractInterface/InterfaceMember.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.UI;
 
 namespace Rubberduck.Refactorings.ExtractInterface
 {
@@ -18,15 +19,26 @@ public override string ToString()
         }
     }
 
-    public class InterfaceMember
+    public class InterfaceMember : ViewModelBase
     {
-        private Declaration Member { get; set; }
-        private IEnumerable<Parameter> MemberParams { get; set; }
-        private string Type { get; set; }
+        private Declaration Member { get; }
+        private IEnumerable<Parameter> MemberParams { get; }
+        private string Type { get; }
 
         private string MemberType { get; set; }
 
-        public bool IsSelected { get; set; }
+        private bool _isSelected;
+        public bool IsSelected
+        {
+            get { return _isSelected; }
+            set
+            {
+                _isSelected = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public string Identifier { get; }
 
         public string FullMemberSignature
         {
@@ -39,9 +51,10 @@ public string FullMemberSignature
             }
         }
 
-        public InterfaceMember(Declaration member, IEnumerable<Declaration> declarations)
+        public InterfaceMember(Declaration member)
         {
             Member = member;
+            Identifier = member.IdentifierName;
             Type = member.AsTypeName;
 
             GetMethodType();
@@ -109,13 +122,7 @@ private void GetMethodType()
             }
         }
 
-        public string Body
-        {
-            get
-            {
-                return "Public " + FullMemberSignature + Environment.NewLine +
-                "End " + MemberType.Split(' ').First() + Environment.NewLine;
-            }
-        }
+        public string Body => "Public " + FullMemberSignature + Environment.NewLine +
+                              "End " + MemberType.Split(' ').First() + Environment.NewLine;
     }
 }