Modified to use RubberduckUI resources

BZngr · BZngr · commit 50e4b675065b · 2020-01-13T14:41:50.000-08:00
diff --git a/Rubberduck.Refactorings/EncapsulateField/EncapsulateFIeldResources.cs b/Rubberduck.Refactorings/EncapsulateField/EncapsulateFIeldResources.cs
diff --git a/Rubberduck.Refactorings/EncapsulateField/EncapsulationStrategies/EncapsulateFieldStrategyBase.cs b/Rubberduck.Refactorings/EncapsulateField/EncapsulationStrategies/EncapsulateFieldStrategyBase.cs
@@ -4,6 +4,7 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.EncapsulateField.Extensions;
+using Rubberduck.Resources;
 using Rubberduck.SmartIndenter;
 using Rubberduck.VBEditor;
 using System;
@@ -91,7 +92,7 @@ private void InsertNewContent(EncapsulateFieldModel model, IEncapsulateFieldRewr
 
             if (isPreview)
             {
-                AddContentBlock(NewContentTypes.PostContentMessage, EncapsulateFieldResources.PreviewMarker);
+                AddContentBlock(NewContentTypes.PostContentMessage, RubberduckUI.EncapsulateField_PreviewMarker);
             }
 
             var newContentBlock = string.Join(DoubleSpace,
diff --git a/Rubberduck.Refactorings/EncapsulateField/FieldCandidates/ArrayCandidate.cs b/Rubberduck.Refactorings/EncapsulateField/FieldCandidates/ArrayCandidate.cs
@@ -2,6 +2,7 @@
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Resources;
 using System;
 using System.Linq;
 
@@ -31,6 +32,19 @@ public ArrayCandidate(Declaration declaration, IValidateVBAIdentifiers validator
             }
         }
 
+        public override bool TryValidateEncapsulationAttributes(out string errorMessage)
+        {
+            errorMessage = string.Empty;
+            if (!EncapsulateFlag) { return true; }
+
+            if (HasExternalRedimOperation)
+            {
+                errorMessage = string.Format(RubberduckUI.EncapsulateField_ArrayHasExternalRedimFormat, IdentifierName);
+                return false;
+            }
+            return ConflictFinder.TryValidateEncapsulationAttributes(this, out errorMessage);
+        }
+
         public string UDTMemberDeclaration
             => $"{PropertyIdentifier}({_subscripts}) {Tokens.As} {Declaration.AsTypeName}";
 
diff --git a/Rubberduck.Refactorings/EncapsulateField/FieldCandidates/ConvertToUDTMemberCandidate.cs b/Rubberduck.Refactorings/EncapsulateField/FieldCandidates/ConvertToUDTMemberCandidate.cs
@@ -136,6 +136,10 @@ public string ReferenceAccessor(IdentifierReference idRef)
 
         public bool TryValidateEncapsulationAttributes(out string errorMessage)
         {
+            if (_wrapped is IArrayCandidate ac)
+            {
+                return ac.TryValidateEncapsulationAttributes(out errorMessage);
+            }
             return ConflictFinder.TryValidateEncapsulationAttributes(this, out errorMessage);
         }
 
@@ -169,22 +173,8 @@ public override bool Equals(object obj)
 
         public override int GetHashCode() => _hashCode;
 
-        private static string BuildUniqueID(IEncapsulateFieldCandidate candidate, IObjectStateUDT field) => $"{candidate.QualifiedModuleName.Name}.{field.IdentifierName}.{candidate.IdentifierName}";
-
-        private PropertyAttributeSet CreateMemberPropertyAttributeSet (IUserDefinedTypeMemberCandidate udtMember)
-        {
-            return new PropertyAttributeSet()
-            {
-                PropertyName = udtMember.PropertyIdentifier,
-                BackingField = $"{ObjectStateUDT.FieldIdentifier}.{udtMember.UDTField.PropertyIdentifier}.{udtMember.BackingIdentifier}",
-                AsTypeName = udtMember.PropertyAsTypeName,
-                ParameterName = udtMember.ParameterName,
-                GenerateLetter = udtMember.ImplementLet,
-                GenerateSetter = udtMember.ImplementSet,
-                UsesSetAssignment = udtMember.Declaration.IsObject,
-                IsUDTProperty = (udtMember.Declaration.AsTypeDeclaration?.DeclarationType ?? DeclarationType.Variable) == DeclarationType.UserDefinedType
-            };
-        }
+        private static string BuildUniqueID(IEncapsulateFieldCandidate candidate, IObjectStateUDT field) 
+            => $"{candidate.QualifiedModuleName.Name}.{field.IdentifierName}.{candidate.IdentifierName}";
 
         private PropertyAttributeSet AsPropertyAttributeSet
         {
diff --git a/Rubberduck.Refactorings/EncapsulateField/FieldCandidates/EncapsulateFieldCandidate.cs b/Rubberduck.Refactorings/EncapsulateField/FieldCandidates/EncapsulateFieldCandidate.cs
@@ -2,6 +2,7 @@
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Refactorings.EncapsulateField.Extensions;
+using Rubberduck.Resources;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.SafeComWrappers;
 using System;
@@ -99,7 +100,7 @@ public virtual string BackingIdentifier
 
         public virtual IEncapsulateFieldConflictFinder ConflictFinder { set; get; }
 
-        public bool TryValidateEncapsulationAttributes(out string errorMessage) 
+        public virtual bool TryValidateEncapsulationAttributes(out string errorMessage) 
             => ConflictFinder.TryValidateEncapsulationAttributes(this, out errorMessage);
 
         public virtual string TargetID => _target?.IdentifierName ?? IdentifierName;
@@ -205,7 +206,7 @@ public string IdentifierName
 
         public virtual string ReferenceQualifier { set; get; }
 
-        public string ParameterName { set; get; } = EncapsulateFieldResources.DefaultPropertyParameter;
+        public string ParameterName { set; get; } = RubberduckUI.EncapsulateField_DefaultPropertyParameter;
 
         private bool _implLet;
         public bool ImplementLet { get => !IsReadOnly && _implLet; set => _implLet = value; }
diff --git a/Rubberduck.Refactorings/EncapsulateField/FieldCandidates/EncapsulationIdentifiers.cs b/Rubberduck.Refactorings/EncapsulateField/FieldCandidates/EncapsulationIdentifiers.cs
@@ -4,12 +4,13 @@
 using System.Collections.Generic;
 using Rubberduck.Refactorings.EncapsulateField.Extensions;
 using System;
+using Rubberduck.Resources;
 
 namespace Rubberduck.Refactorings.EncapsulateField
 {
     public class EncapsulationIdentifiers
     {
-        private static string DEFAULT_WRITE_PARAMETER = EncapsulateFieldResources.DefaultPropertyParameter;
+        private static string DEFAULT_WRITE_PARAMETER = RubberduckUI.EncapsulateField_DefaultPropertyParameter;
 
         private KeyValuePair<string, string> _fieldAndProperty;
         private string _targetIdentifier;
diff --git a/Rubberduck.Refactorings/EncapsulateField/ObjectStateUDT.cs b/Rubberduck.Refactorings/EncapsulateField/ObjectStateUDT.cs
@@ -9,6 +9,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Rubberduck.Refactorings.EncapsulateField.Extensions;
+using Rubberduck.Resources;
 
 namespace Rubberduck.Refactorings.EncapsulateField
 {
@@ -29,7 +30,7 @@ public interface IObjectStateUDT : IEncapsulateFieldRefactoringElement
     //newly inserted declaration
     public class ObjectStateUDT : IObjectStateUDT
     {
-        private static string _defaultNewFieldName = EncapsulateFieldResources.DefaultStateUDTFieldName;
+        private static string _defaultNewFieldName = RubberduckUI.EncapsulateField_DefaultObjectStateUDTFieldName; // EncapsulateFieldResources.DefaultStateUDTFieldName;
         private List<IConvertToUDTMember> _convertedMembers;
 
         private readonly IUserDefinedTypeCandidate _wrappedUDT;
diff --git a/Rubberduck.Refactorings/EncapsulateField/Validations/EncapsulateFieldConflictFinderBase.cs b/Rubberduck.Refactorings/EncapsulateField/Validations/EncapsulateFieldConflictFinderBase.cs
@@ -1,6 +1,7 @@
 ﻿using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.EncapsulateField.Extensions;
+using Rubberduck.Resources;
 using Rubberduck.VBEditor;
 using System;
 using System.Collections.Generic;
@@ -116,7 +117,7 @@ protected virtual bool InternalHasConflictingIdentifier(IEncapsulateFieldCandida
 
             if (potentialDeclarationIdentifierConflicts.Any(m => m.IsEquivalentVBAIdentifierTo(identifierToCompare)))
             {
-                errorMessage = EncapsulateFieldResources.NameConflictDetected;
+                errorMessage = RubberduckUI.EncapsulateField_NameConflictDetected;
                 return true;
             }
             return false;
diff --git a/Rubberduck.Refactorings/EncapsulateField/Validations/EncapsulateFieldValidationsProvider.cs b/Rubberduck.Refactorings/EncapsulateField/Validations/EncapsulateFieldValidationsProvider.cs
@@ -2,6 +2,7 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Common;
 using Rubberduck.Refactorings.EncapsulateField.Extensions;
+using Rubberduck.Resources;
 using Rubberduck.VBEditor;
 using System;
 using System.Collections.Generic;
@@ -83,7 +84,7 @@ public static IValidateVBAIdentifiers NameOnlyValidator(NameValidators validator
 
         public static IEncapsulateFieldCandidate AssignNoConflictParameter(IEncapsulateFieldCandidate candidate)
         {
-            candidate.ParameterName = EncapsulateFieldResources.DefaultPropertyParameter;
+            candidate.ParameterName = RubberduckUI.EncapsulateField_DefaultPropertyParameter;
 
             var guard = 0;
             while (guard++ < 10 && (candidate.BackingIdentifier.IsEquivalentVBAIdentifierTo(candidate.ParameterName)
diff --git a/RubberduckTests/Refactoring/EncapsulateField/EncapsulateArrayFieldTests.cs b/RubberduckTests/Refactoring/EncapsulateField/EncapsulateArrayFieldTests.cs
@@ -4,6 +4,7 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.EncapsulateField;
+using Rubberduck.Resources;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.Utility;
 using RubberduckTests.Mocks;
@@ -204,9 +205,13 @@ End Sub
             var vbe = MockVbeBuilder.BuildFromStdModules(("SourceModule", inputCode), ("ClientModule", redimCode));
             var model = Support.RetrieveUserModifiedModelPriorToRefactoring(vbe.Object, fieldUT, DeclarationType.Variable, presenterAction);
 
-            model[fieldUT].TryValidateEncapsulationAttributes(out var errorMessage);
+            var field = model[fieldUT];
 
-            StringAssert.AreNotEqualIgnoringCase(EncapsulateFieldResources.ArrayHasExternalRedimFormat, errorMessage);
+            field.TryValidateEncapsulationAttributes(out var errorMessage);
+
+            var expectedError = string.Format(RubberduckUI.EncapsulateField_ArrayHasExternalRedimFormat, field.IdentifierName);
+
+            StringAssert.AreEqualIgnoringCase(expectedError, errorMessage);
         }
 
         protected override IRefactoring TestRefactoring(IRewritingManager rewritingManager, RubberduckParserState state, IRefactoringPresenterFactory factory, ISelectionService selectionService)

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using Rubberduck.Parsing.Symbols;`
`5`	`5`	`using Rubberduck.Parsing.VBA;`
`6`	`6`	`using Rubberduck.Refactorings.EncapsulateField.Extensions;`
	`7`	`+using Rubberduck.Resources;`
`7`	`8`	`using Rubberduck.SmartIndenter;`
`8`	`9`	`using Rubberduck.VBEditor;`
`9`	`10`	`using System;`
`@@ -91,7 +92,7 @@ private void InsertNewContent(EncapsulateFieldModel model, IEncapsulateFieldRewr`
`91`	`92`
`92`	`93`	`if (isPreview)`
`93`	`94`	`{`
`94`		`- AddContentBlock(NewContentTypes.PostContentMessage, EncapsulateFieldResources.PreviewMarker);`
	`95`	`+ AddContentBlock(NewContentTypes.PostContentMessage, RubberduckUI.EncapsulateField_PreviewMarker);`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`var newContentBlock = string.Join(DoubleSpace,`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,13 @@`
`4`	`4`	`using System.Collections.Generic;`
`5`	`5`	`using Rubberduck.Refactorings.EncapsulateField.Extensions;`
`6`	`6`	`using System;`
	`7`	`+using Rubberduck.Resources;`
`7`	`8`
`8`	`9`	`namespace Rubberduck.Refactorings.EncapsulateField`
`9`	`10`	`{`
`10`	`11`	`public class EncapsulationIdentifiers`
`11`	`12`	`{`
`12`		`- private static string DEFAULT_WRITE_PARAMETER = EncapsulateFieldResources.DefaultPropertyParameter;`
	`13`	`+ private static string DEFAULT_WRITE_PARAMETER = RubberduckUI.EncapsulateField_DefaultPropertyParameter;`
`13`	`14`
`14`	`15`	`private KeyValuePair<string, string> _fieldAndProperty;`
`15`	`16`	`private string _targetIdentifier;`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using System.Text;`
`10`	`10`	`using System.Threading.Tasks;`
`11`	`11`	`using Rubberduck.Refactorings.EncapsulateField.Extensions;`
	`12`	`+using Rubberduck.Resources;`
`12`	`13`
`13`	`14`	`namespace Rubberduck.Refactorings.EncapsulateField`
`14`	`15`	`{`
`@@ -29,7 +30,7 @@ public interface IObjectStateUDT : IEncapsulateFieldRefactoringElement`
`29`	`30`	`//newly inserted declaration`
`30`	`31`	`public class ObjectStateUDT : IObjectStateUDT`
`31`	`32`	`{`
`32`		`- private static string _defaultNewFieldName = EncapsulateFieldResources.DefaultStateUDTFieldName;`
	`33`	`+ private static string _defaultNewFieldName = RubberduckUI.EncapsulateField_DefaultObjectStateUDTFieldName; // EncapsulateFieldResources.DefaultStateUDTFieldName;`
`33`	`34`	`private List<IConvertToUDTMember> _convertedMembers;`
`34`	`35`
`35`	`36`	`private readonly IUserDefinedTypeCandidate _wrappedUDT;`