Resolve build errors and cleanup following merge

Author: BZngr

Rubberduck.Refactorings/Common/CodeBuilder.cs

@@ -70,12 +70,6 @@ bool TryBuildPropertySetCodeBlock(Declaration prototype,
             string content = null,
             string parameterIdentifier = null);
 
-        /// <summary>
-        /// Generates a default RHS property parameter IdentifierName
-        /// </summary>
-        /// <param name="propertyIdentifier">Let/Set Property IdentifierName</param>
-        string BuildPropertyRhsParameterName(string propertyIdentifier);
-
         /// <summary>
         /// Generates a UserDefinedType (UDT) declaration using a <c>VariableDeclaration</c> as the prototype for
         /// creating the UserDefinedTypeMember.

Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldElementsBuilder.cs

@@ -6,9 +6,6 @@ namespace Rubberduck.Refactorings.EncapsulateField
 {
     public enum NewContentType
     {
-        ImplementsDeclaration,
-        WithEventsDeclaration,
-        EnumerationTypeDeclaration,
         UserDefinedTypeDeclaration,
         DeclarationBlock,
         CodeSectionBlock,

Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldInsertNewCode/NewContentAggregator.cs

@@ -15,8 +15,8 @@ public interface IArrayCandidate : IEncapsulateFieldCandidate
     public class ArrayCandidate : EncapsulateFieldCandidate, IArrayCandidate
     {
         private string _subscripts;
-        public ArrayCandidate(Declaration declaration, Func<string,string> parameterNameBuilder)
-            :base(declaration, parameterNameBuilder)
+        public ArrayCandidate(Declaration declaration)
+            :base(declaration)
         {
             ImplementLet = false;
             ImplementSet = false;

Rubberduck.Refactorings/EncapsulateField/FieldCandidates/ArrayCandidate.cs

@@ -4,7 +4,6 @@
 using Rubberduck.Refactorings.Common;
 using Rubberduck.Refactorings.EncapsulateField.Extensions;
 using Rubberduck.VBEditor;
-using System;
 using System.Collections.Generic;
 
 namespace Rubberduck.Refactorings.EncapsulateField
@@ -59,18 +58,10 @@ public class EncapsulateFieldCandidate : IEncapsulateFieldCandidate
         protected EncapsulationIdentifiers _fieldAndProperty;
         private string _rhsParameterIdentifierName;
 
-//<<<<<<< HEAD
-        public EncapsulateFieldCandidate(Declaration declaration, Func<string, string> parameterNameBuilder)
-        //{
-            //_target = declaration;
-            //_parameterNameBuilder = parameterNameBuilder;
-//=======
-        //public EncapsulateFieldCandidate(Declaration declaration, IValidateVBAIdentifiers identifierValidator)
+        public EncapsulateFieldCandidate(Declaration declaration)
         {
             _target = declaration;
-            //NameValidator = identifierValidator;
             _rhsParameterIdentifierName = Resources.Refactorings.Refactorings.CodeBuilder_DefaultPropertyRHSParam;
-//>>>>>>> rubberduck-vba/next
 
             _fieldAndProperty = new EncapsulationIdentifiers(declaration.IdentifierName);
             IdentifierName = declaration.IdentifierName;
@@ -86,8 +77,7 @@ public EncapsulateFieldCandidate(Declaration declaration, Func<string, string> p
             ImplementSet = false;
             if (_target.IsEnumField() && _target.AsTypeDeclaration.HasPrivateAccessibility())
             {
-                //5.3.1 The declared type of a function declaration 
-                //may not be a private enum name.
+                //5.3.1 The declared type of a function declaration may not be a private enum.
                 PropertyAsTypeName = Tokens.Long;
             }
             else if (_target.AsTypeName.Equals(Tokens.Variant)

Rubberduck.Refactorings/EncapsulateField/FieldCandidates/EncapsulateFieldCandidate.cs

@@ -26,15 +26,15 @@ public IEncapsulateFieldCandidate Create(Declaration target)
         {
             if (target.IsUserDefinedType())
             {
-                var udtField = new UserDefinedTypeCandidate(target, _codeBuilder.BuildPropertyRhsParameterName) as IUserDefinedTypeCandidate;
+                var udtField = new UserDefinedTypeCandidate(target) as IUserDefinedTypeCandidate;
 
                 var udtMembers = _declarationFinderProvider.DeclarationFinder
                     .UserDeclarations(DeclarationType.UserDefinedTypeMember)
                     .Where(utm => udtField.Declaration.AsTypeDeclaration == utm.ParentDeclaration);
 
                 foreach (var udtMemberDeclaration in udtMembers)
                 {
-                    var candidateUDTMember = new UserDefinedTypeMemberCandidate(Create(udtMemberDeclaration), udtField, _codeBuilder.BuildPropertyRhsParameterName) as IUserDefinedTypeMemberCandidate;
+                    var candidateUDTMember = new UserDefinedTypeMemberCandidate(Create(udtMemberDeclaration), udtField) as IUserDefinedTypeMemberCandidate;
 
                     udtField.AddMember(candidateUDTMember);
                 }
@@ -50,11 +50,11 @@ public IEncapsulateFieldCandidate Create(Declaration target)
             }
             else if (target.IsArray)
             {
-                var arrayCandidate = new ArrayCandidate(target, _codeBuilder.BuildPropertyRhsParameterName);
+                var arrayCandidate = new ArrayCandidate(target);
                 return arrayCandidate;
             }
 
-            return new EncapsulateFieldCandidate(target, _codeBuilder.BuildPropertyRhsParameterName);
+            return new EncapsulateFieldCandidate(target);
         }
     }
 }

Rubberduck.Refactorings/EncapsulateField/FieldCandidates/EncapsulateFieldCandidateFactory.cs

@@ -1,7 +1,6 @@
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Refactorings.Common;
-using System;
 using System.Collections.Generic;
 
 namespace Rubberduck.Refactorings.EncapsulateField
@@ -17,8 +16,8 @@ public interface IUserDefinedTypeCandidate : IEncapsulateFieldCandidate
 
     public class UserDefinedTypeCandidate : EncapsulateFieldCandidate, IUserDefinedTypeCandidate
     {
-        public UserDefinedTypeCandidate(Declaration declaration, Func<string,string> parameterNameBuilder)
-            : base(declaration, parameterNameBuilder)
+        public UserDefinedTypeCandidate(Declaration declaration)
+            : base(declaration)
         {
             TypeDeclarationIsPrivate = declaration.HasPrivateAccessibility();
         }