Merge branch 'next' into Issue2142

Author: Hosch250

RetailCoder.VBE/Inspections/EncapsulatePublicFieldInspectionResult.cs

@@ -54,7 +54,7 @@ public override void Fix()
         {
             var vbe = Selection.QualifiedName.Project.VBE;
 
-            using (var view = new EncapsulateFieldDialog(_indenter))
+            using (var view = new EncapsulateFieldDialog(_state, _indenter))
             {
                 var factory = new EncapsulateFieldPresenterFactory(vbe, _state, view);
                 var refactoring = new EncapsulateFieldRefactoring(vbe, _indenter, factory);

RetailCoder.VBE/Refactorings/EncapsulateField/EncapsulateFieldPresenter.cs

@@ -41,8 +41,8 @@ public EncapsulateFieldModel Show()
         {
             if (_model.TargetDeclaration == null) { return null; }
 
-            _view.NewPropertyName = _model.TargetDeclaration.IdentifierName;
             _view.TargetDeclaration = _model.TargetDeclaration;
+            _view.NewPropertyName = _model.TargetDeclaration.IdentifierName;
 
             if (_model.TargetDeclaration.References.Any(r => r.IsAssignment))
             {

RetailCoder.VBE/UI/Command/Refactorings/RefactorEncapsulateFieldCommand.cs

@@ -46,7 +46,7 @@ protected override void ExecuteImpl(object parameter)
                 return;
             }
 
-            using (var view = new EncapsulateFieldDialog(_indenter))
+            using (var view = new EncapsulateFieldDialog(_state, _indenter))
             {
                 var factory = new EncapsulateFieldPresenterFactory(Vbe, _state, view);
                 var refactoring = new EncapsulateFieldRefactoring(Vbe, _indenter, factory);

RetailCoder.VBE/UI/Refactorings/EncapsulateFieldDialog.cs

@@ -3,6 +3,7 @@
 using System.Windows.Forms;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.EncapsulateField;
 
 namespace Rubberduck.UI.Refactorings
@@ -11,6 +12,7 @@ namespace Rubberduck.UI.Refactorings
 
     public partial class EncapsulateFieldDialog : Form, IEncapsulateFieldDialog
     {
+        private readonly RubberduckParserState _state;
         private readonly IIndenter _indenter;
 
         public string NewPropertyName
@@ -79,8 +81,9 @@ public bool MustImplementSetSetterType
             }
         }
 
-        public EncapsulateFieldDialog(IIndenter indenter)
+        public EncapsulateFieldDialog(RubberduckParserState state, IIndenter indenter)
         {
+            _state = state;
             _indenter = indenter;
             InitializeComponent();
             LocalizeDialog();
@@ -166,7 +169,9 @@ private string GetPropertyText()
 
         private void ValidatePropertyName()
         {
-            InvalidPropertyNameIcon.Visible = ValidateName(NewPropertyName, ParameterName);
+            InvalidPropertyNameIcon.Visible = ValidateName(NewPropertyName, ParameterName) ||
+                                              _state.AllUserDeclarations.Where(a => a.ParentScope == TargetDeclaration.ParentScope)
+                                                                        .Any(a => a.IdentifierName == NewPropertyName);
 
             SetOkButtonEnabledState();
         }