And...some more cleanup

Author: BZngr

Rubberduck.CodeAnalysis/QuickFixes/AssignedByValParameterMakeLocalCopyQuickFix.cs

@@ -78,13 +78,6 @@ private string PromptForLocalVariableName(Declaration target)
         private bool IsNameCollision(string newName)
             => _parserState.DeclarationFinder.FindNewDeclarationNameConflicts(newName, _quickFixTarget).Any();
 
-        private static bool IsSubroutineOrProperty(Declaration declaration)
-        {
-            return declaration.DeclarationType.HasFlag(DeclarationType.Property)
-                || declaration.DeclarationType == DeclarationType.Function
-                || declaration.DeclarationType == DeclarationType.Procedure;
-        }
-
         private string GetDefaultLocalIdentifier(Declaration target)
         {
             var newName = $"local{target.IdentifierName.CapitalizeFirstLetter()}";

Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs

@@ -9,7 +9,7 @@ public partial class AssignedByValParameterQuickFixDialog : Form, IAssignedByVal
     {
         private readonly Func<string, bool> _isConflictingName;
 
-        public AssignedByValParameterQuickFixDialog(string identifier, string identifierType, Func<string, bool> nameCollisionChecker)//, IEnumerable<string> forbiddenNames)
+        public AssignedByValParameterQuickFixDialog(string identifier, string identifierType, Func<string, bool> nameCollisionChecker)
         {
             InitializeComponent();
             InitializeCaptions(identifier, identifierType);

Rubberduck.Parsing/Symbols/DeclarationFinder.cs

@@ -1015,17 +1015,21 @@ private List<Declaration> FindAllEventHandlers()
             return handlers.ToList();
         }
 
+        /// <summary>
+        /// Finds declarations that would be in conflict with the target declaration if renamed.
+        /// </summary>
+        /// <returns>Zero or more declarations that would be in conflict if the target declaration is renamed.</returns>
         public IEnumerable<Declaration> FindNewDeclarationNameConflicts(string newName, Declaration renameTarget)
         {
             if (newName.Equals(renameTarget.IdentifierName))
             {
-                return new List<Declaration>();
+                return Enumerable.Empty<Declaration>();
             }
 
             var identifierMatches = MatchName(newName);
             if (!identifierMatches.Any())
             {
-                return new List<Declaration>();
+                return Enumerable.Empty<Declaration>();
             }
 
             if (IsEnumOrUDTMemberDeclaration(renameTarget)) 
@@ -1049,7 +1053,7 @@ public IEnumerable<Declaration> FindNewDeclarationNameConflicts(string newName,
                             .Any(idmRef => idmRef.ParentScoping == renameTargetRef.ParentScoping
                                 && !UsesScopeResolution(renameTargetRef.Context.Parent)))
                 || idm.DeclarationType.HasFlag(DeclarationType.Variable)
-                    && idm.ParentDeclaration.DeclarationType.HasFlag(DeclarationType.Module) //?
+                    && idm.ParentDeclaration.DeclarationType.HasFlag(DeclarationType.Module)
                     && renameTarget.References.Any(renameTargetRef => renameTargetRef.QualifiedModuleName == idm.ParentDeclaration.QualifiedModuleName));
 
             if (referenceConflicts.Any())

Rubberduck.Resources/RubberduckUI.Designer.cs

@@ -484,7 +484,7 @@ Warning: All customized settings will be lost.  Your old file will be saved in '
     <value>New</value>
   </data>
   <data name="RenameDialog_ConflictingNames" xml:space="preserve">
-    <value>'{0}' conflicts with an existing name. Renaming '{1}' to'{0}' may result in uncompilable code or a change in logic.
+    <value>'{0}' conflicts with an existing name. Renaming '{1}' to '{0}' may result in uncompilable code or a change in logic.
 Do you want to proceed with this rename?</value>
     <comment>0: NewName 1: CurrentName</comment>
   </data>

Rubberduck.Resources/RubberduckUI.resx

@@ -388,10 +388,6 @@ public void RenameRefactoring_RenameSub_ConflictingNames_Reject()
                     @"Private Sub Fo|o()
     Dim Goo As Integer
 End Sub",
-//                Expected =
-//                    @"Private Sub Foo()
-//    Dim Goo As Integer
-//End Sub"
             };
             tdo.MsgBoxReturn = ConfirmationOutcome.No;
             PerformExpectedVersusActualRenameTests(tdo, inputOutput);