Fix name validation for EncapsulateFieldDialog

rubberduck-vba · Feb 25, 2017 · af3b2f3 · af3b2f3
1 parent 9d2c779
commit af3b2f3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/RetailCoder.VBE/UI/Refactorings/EncapsulateFieldDialog.cs b/RetailCoder.VBE/UI/Refactorings/EncapsulateFieldDialog.cs
@@ -171,7 +171,7 @@ private void ValidatePropertyName()
         {
             InvalidPropertyNameIcon.Visible = ValidateName(NewPropertyName, ParameterName) ||
                                               _state.AllUserDeclarations.Where(a => a.ParentScope == TargetDeclaration.ParentScope)
-                                                                        .Any(a => a.IdentifierName == NewPropertyName);
+                                                                        .Any(a => a.IdentifierName.Equals(NewPropertyName, StringComparison.InvariantCultureIgnoreCase));
 
             SetOkButtonEnabledState();
         }
@@ -188,8 +188,8 @@ private bool ValidateName(string changedName, string otherName)
             var tokenValues = typeof(Tokens).GetFields().Select(item => item.GetValue(null)).Cast<string>().Select(item => item);
 
             return TargetDeclaration == null
-                               || changedName == TargetDeclaration.IdentifierName
-                               || changedName == otherName
+                               || changedName.Equals(TargetDeclaration.IdentifierName, StringComparison.InvariantCultureIgnoreCase)
+                               || changedName.Equals(otherName, StringComparison.InvariantCultureIgnoreCase)
                                || !char.IsLetter(changedName.FirstOrDefault())
                                || tokenValues.Contains(ParameterName, StringComparer.InvariantCultureIgnoreCase)
                                || changedName.Any(c => !char.IsLetterOrDigit(c) && c != '_');