Get RHS Dflt Parameter from Resource.Refactorings

Author: BZngr

Rubberduck.Refactorings/Common/CodeBuilder.cs

@@ -68,16 +68,10 @@ bool TryBuildPropertySetCodeBlock(Declaration prototype,
                                             string accessibility = null,
                                             string content = null,
                                             string parameterIdentifier = null);
-        /// <summary>
-        /// Default RHS property parameter IdentifierName
-        /// </summary>
-        string DefaultLetSetRhsParameterIdentifierName { get; }
     }
 
     public class CodeBuilder : ICodeBuilder
     {
-        public string DefaultLetSetRhsParameterIdentifierName => "RHS";
-
         public string BuildMemberBlockFromPrototype(ModuleBodyElementDeclaration declaration, 
                                         string content = null, 
                                         string accessibility = null, 
@@ -117,7 +111,7 @@ private bool TryBuildPropertyBlockFromTarget<T>(T prototype, DeclarationType let
                 return false;
             }
 
-            var propertyValueParam = parameterIdentifier ?? DefaultLetSetRhsParameterIdentifierName;
+            var propertyValueParam = parameterIdentifier ?? Resources.Refactorings.Refactorings.CodeBuilder_DefaultPropertyRHSParam;
 
             var asType = prototype.IsArray
                 ? $"{Tokens.Variant}"

Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldElementsBuilder.cs

@@ -1,5 +1,4 @@
-using Rubberduck.Parsing.Grammar;
-using Rubberduck.Parsing.Symbols;
+using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Common;
 using Rubberduck.VBEditor;
@@ -111,7 +110,7 @@ private IEncapsulateFieldCandidate CreateCandidate(Declaration target, IValidate
             if (target.IsUserDefinedType())
             {
                 var udtValidator = EncapsulateFieldValidationsProvider.NameOnlyValidator(NameValidators.UserDefinedType);
-                var udtField = new UserDefinedTypeCandidate(target, udtValidator, _codeBuilder.DefaultLetSetRhsParameterIdentifierName) as IUserDefinedTypeCandidate;
+                var udtField = new UserDefinedTypeCandidate(target, udtValidator) as IUserDefinedTypeCandidate;
 
                 (Declaration udtDeclaration, IEnumerable<Declaration> udtMembers) = GetUDTAndMembersForField(udtField);
 
@@ -126,7 +125,7 @@ private IEncapsulateFieldCandidate CreateCandidate(Declaration target, IValidate
                     {
                         udtMemberValidator = EncapsulateFieldValidationsProvider.NameOnlyValidator(NameValidators.UserDefinedTypeMemberArray);
                     }
-                    var candidateUDTMember = new UserDefinedTypeMemberCandidate(CreateCandidate(udtMemberDeclaration, udtMemberValidator), udtField, _codeBuilder.DefaultLetSetRhsParameterIdentifierName) as IUserDefinedTypeMemberCandidate;
+                    var candidateUDTMember = new UserDefinedTypeMemberCandidate(CreateCandidate(udtMemberDeclaration, udtMemberValidator), udtField) as IUserDefinedTypeMemberCandidate;
 
                     udtField.AddMember(candidateUDTMember);
                 }
@@ -142,10 +141,10 @@ private IEncapsulateFieldCandidate CreateCandidate(Declaration target, IValidate
             }
             else if (target.IsArray)
             {
-                return new ArrayCandidate(target, validator, _codeBuilder.DefaultLetSetRhsParameterIdentifierName);
+                return new ArrayCandidate(target, validator);
             }
 
-            var candidate = new EncapsulateFieldCandidate(target, validator, _codeBuilder.DefaultLetSetRhsParameterIdentifierName);
+            var candidate = new EncapsulateFieldCandidate(target, validator);
             return candidate;
         }
 

Rubberduck.Refactorings/EncapsulateField/FieldCandidates/ArrayCandidate.cs

@@ -2,7 +2,6 @@
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Resources;
-using System;
 using System.Linq;
 
 namespace Rubberduck.Refactorings.EncapsulateField
@@ -16,8 +15,8 @@ public interface IArrayCandidate : IEncapsulateFieldCandidate
     public class ArrayCandidate : EncapsulateFieldCandidate, IArrayCandidate
     {
         private string _subscripts;
-        public ArrayCandidate(Declaration declaration, IValidateVBAIdentifiers validator, string rhsParameterIdentifierName)
-            :base(declaration, validator, rhsParameterIdentifierName)
+        public ArrayCandidate(Declaration declaration, IValidateVBAIdentifiers validator)
+            :base(declaration, validator)
         {
             ImplementLet = false;
             ImplementSet = false;

Rubberduck.Refactorings/EncapsulateField/FieldCandidates/EncapsulateFieldCandidate.cs

@@ -47,11 +47,11 @@ public class EncapsulateFieldCandidate : IEncapsulateFieldCandidate
         protected EncapsulationIdentifiers _fieldAndProperty;
         private string _rhsParameterIdentifierName;
 
-        public EncapsulateFieldCandidate(Declaration declaration, IValidateVBAIdentifiers identifierValidator, string rhsParameterIdentifierName)
+        public EncapsulateFieldCandidate(Declaration declaration, IValidateVBAIdentifiers identifierValidator)
         {
             _target = declaration;
             NameValidator = identifierValidator;
-            _rhsParameterIdentifierName = rhsParameterIdentifierName;
+            _rhsParameterIdentifierName = Resources.Refactorings.Refactorings.CodeBuilder_DefaultPropertyRHSParam;
 
             _fieldAndProperty = new EncapsulationIdentifiers(declaration.IdentifierName, identifierValidator);
             IdentifierName = declaration.IdentifierName;

Rubberduck.Refactorings/EncapsulateField/FieldCandidates/UserDefinedTypeCandidate.cs

@@ -17,8 +17,8 @@ public interface IUserDefinedTypeCandidate : IEncapsulateFieldCandidate
 
     public class UserDefinedTypeCandidate : EncapsulateFieldCandidate, IUserDefinedTypeCandidate
     {
-        public UserDefinedTypeCandidate(Declaration declaration, IValidateVBAIdentifiers identifierValidator, string rhsParameterIdentifierName)
-            : base(declaration, identifierValidator, rhsParameterIdentifierName)
+        public UserDefinedTypeCandidate(Declaration declaration, IValidateVBAIdentifiers identifierValidator)
+            : base(declaration, identifierValidator)
         {
         }
 

Rubberduck.Refactorings/EncapsulateField/FieldCandidates/UserDefinedTypeMemberCandidate.cs

@@ -21,10 +21,10 @@ public class UserDefinedTypeMemberCandidate : IUserDefinedTypeMemberCandidate
         private int _hashCode;
         private readonly string _uniqueID;
         private string _rhsParameterIdentifierName;
-        public UserDefinedTypeMemberCandidate(IEncapsulateFieldCandidate candidate, IUserDefinedTypeCandidate udtField, string rhsParameterIdentifierName)
+        public UserDefinedTypeMemberCandidate(IEncapsulateFieldCandidate candidate, IUserDefinedTypeCandidate udtField)
         {
             _wrappedCandidate = candidate;
-            _rhsParameterIdentifierName = rhsParameterIdentifierName;
+            _rhsParameterIdentifierName = Resources.Refactorings.Refactorings.CodeBuilder_DefaultPropertyRHSParam;
             UDTField = udtField;
             PropertyIdentifier = IdentifierName;
             BackingIdentifier = IdentifierName;