Adjust implementation of CodeExplorerAddComponentService

Author: MDoerner

Rubberduck.Core/UI/CodeExplorer/CodeExplorerAddComponentService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Text;
 using Rubberduck.Navigation.CodeExplorer;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.VBEditor.SafeComWrappers;
@@ -48,13 +49,16 @@ public void AddComponentWithAttributes(CodeExplorerItemViewModel node, Component
             var folderAnnotation = FolderAnnotation(node);
             var optionCompare = OptionCompareStatement();
 
-            var basePrefixInModule = optionCompare != null
-                ? $"{folderAnnotation}{Environment.NewLine}{optionCompare}"
-                : folderAnnotation;
-
-            var prefixInModule = additionalPrefixInModule != null
-                ? $"{basePrefixInModule}{Environment.NewLine}{additionalPrefixInModule}"
-                : basePrefixInModule;
+            var modulePrefix = new StringBuilder(folderAnnotation);
+            if (optionCompare != null)
+            {
+                modulePrefix.Append(Environment.NewLine).Append(optionCompare);
+            }
+            if (additionalPrefixInModule != null)
+            {
+                modulePrefix.Append(Environment.NewLine).Append(additionalPrefixInModule);
+            }
+            var prefixInModule = modulePrefix.ToString();
 
             _parseManager.OnSuspendParser(
                 this,
@@ -79,7 +83,7 @@ private string Folder(CodeExplorerItemViewModel node)
             var declaration = node?.Declaration;
             if (declaration == null)
             {
-                return ActiveProjectName();
+                return ActiveProjectFolder();
             }
 
             var customFolder = declaration.CustomFolder;

Rubberduck.Core/UI/CodeExplorer/Commands/CodeExplorerFindAllReferencesCommand.cs

@@ -30,9 +30,10 @@ public CodeExplorerFindAllReferencesCommand(RubberduckParserState state, FindAll
 
         private bool SpecialEvaluateCanExecute(object parameter)
         {
-            return ((ICodeExplorerNode)parameter).Declaration != null &&
-                   (!(parameter is CodeExplorerReferenceViewModel reference) || !reference.IsDimmed) &&
-                   _state.Status == ParserState.Ready;
+            return _state.Status == ParserState.Ready
+                       && ((ICodeExplorerNode)parameter).Declaration != null 
+                       && !(parameter is CodeExplorerReferenceViewModel reference 
+                            && reference.IsDimmed);
         }
 
         protected override void OnExecute(object parameter)