Changes following PR comments

rubberduck-vba · Jul 25, 2019 · ae447f5 · ae447f5
1 parent d421173
commit ae447f5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/Rubberduck.Core/UI/CodeExplorer/Commands/DeleteCommand.cs b/Rubberduck.Core/UI/CodeExplorer/Commands/DeleteCommand.cs
@@ -25,7 +25,9 @@ public DeleteCommand(RemoveCommand removeCommand, IProjectsProvider projectsProv
             _vbe = vbe;
 
             AddToCanExecuteEvaluation(SpecialEvaluateCanExecute);
-        }        
+        }
+
+        public override IEnumerable<Type> ApplicableNodeTypes => new List<Type> { typeof(CodeExplorerComponentViewModel) };
 
         private bool SpecialEvaluateCanExecute(object parameter)
         {
@@ -79,7 +81,7 @@ protected override void OnExecute(object parameter)
                 }
                 catch (Exception exception)
                 {
-                    Logger.Error(exception, "Failed to delete file");                 
+                    Logger.Warn(exception, "Failed to delete file");                 
                     failedDeletions.Add(file);
                 }
             }
@@ -92,7 +94,5 @@ protected override void OnExecute(object parameter)
             }
 
         }
-
-        public override IEnumerable<Type> ApplicableNodeTypes => new List<Type> { typeof(CodeExplorerComponentViewModel) };
     }
 }
diff --git a/Rubberduck.Core/UI/CodeExplorer/Commands/ExportCommand.cs b/Rubberduck.Core/UI/CodeExplorer/Commands/ExportCommand.cs
@@ -36,15 +36,15 @@ public class ExportCommand : CommandBase
         };
 
         private readonly IFileSystemBrowserFactory _dialogFactory;
-        private readonly Dictionary<ComponentType, string> _ExportableFileExtensions;
+        private readonly Dictionary<ComponentType, string> _exportableFileExtensions;
 
         public ExportCommand(IFileSystemBrowserFactory dialogFactory, IMessageBox messageBox, IProjectsProvider projectsProvider, IVBE vbe)
         {
             _dialogFactory = dialogFactory;
             MessageBox = messageBox;
             ProjectsProvider = projectsProvider;
 
-            _ExportableFileExtensions =
+            _exportableFileExtensions =
                 vbe.Kind == VBEKind.Hosted
                     ? VBAExportableFileExtensions
                     : VB6ExportableFileExtensions;
@@ -65,7 +65,7 @@ private bool SpecialEvaluateCanExecute(object parameter)
 
             var componentType = node.Declaration.QualifiedName.QualifiedModuleName.ComponentType;
 
-            return _ExportableFileExtensions.Select(s => s.Key).Contains(componentType);
+            return _exportableFileExtensions.ContainsKey(componentType);
         }
 
         protected override void OnExecute(object parameter)
@@ -81,7 +81,7 @@ protected override void OnExecute(object parameter)
 
         public bool PromptFileNameAndExport(QualifiedModuleName qualifiedModule)
         {
-            if (!_ExportableFileExtensions.TryGetValue(qualifiedModule.ComponentType, out var extension))
+            if (!_exportableFileExtensions.TryGetValue(qualifiedModule.ComponentType, out var extension))
             {
                 return false;
             }
@@ -104,6 +104,7 @@ public bool PromptFileNameAndExport(QualifiedModuleName qualifiedModule)
                 }
                 catch (Exception ex)
                 {
+                    Logger.Warn(ex, $"Failed to export component {qualifiedModule.Name}");
                     MessageBox.NotifyWarn(ex.Message, string.Format(Resources.CodeExplorer.CodeExplorerUI.ExportError_Caption, qualifiedModule.ComponentName));
                 }                    
                 return true;

diff --git a/Rubberduck.Core/UI/CodeExplorer/Commands/RemoveCommand.cs b/Rubberduck.Core/UI/CodeExplorer/Commands/RemoveCommand.cs
@@ -1,16 +1,16 @@
 using System;
+using System.Collections.Generic;
 using Rubberduck.Interaction;
 using Rubberduck.Navigation.CodeExplorer;
 using Rubberduck.Resources.CodeExplorer;
-using Rubberduck.UI.Command;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.CodeExplorer.Commands
 {
-    public class RemoveCommand : CommandBase
+    public class RemoveCommand : CodeExplorerCommandBase
     {
         private readonly ExportCommand _exportCommand;
         private readonly IProjectsRepository _projectsRepository;
@@ -27,6 +27,8 @@ public RemoveCommand(ExportCommand exportCommand, IProjectsRepository projectsRe
             AddToCanExecuteEvaluation(SpecialEvaluateCanExecute);
         }
 
+        public override IEnumerable<Type> ApplicableNodeTypes => new List<Type> { typeof(CodeExplorerComponentViewModel) };
+
         private bool SpecialEvaluateCanExecute(object parameter)
         {
             return _exportCommand.CanExecute(parameter) &&
@@ -83,17 +85,19 @@ private bool TryExport(QualifiedModuleName qualifiedModuleName)
             switch (_messageBox.Confirm(message, CodeExplorerUI.ExportBeforeRemove_Caption, ConfirmationOutcome.Yes))
             {
                 case ConfirmationOutcome.No:
+                    // User elected to remove without export, return success.
                     return true;
 
                 case ConfirmationOutcome.Yes:
                     if (_exportCommand.PromptFileNameAndExport(qualifiedModuleName))
                     {
+                        // Export complete
                         return true;
                     }
                     break;
             }
 
-            return false; // Export cancelled or failed
+            return false; // Save dialog cancelled or export failed (failures will have already been displayed and logged by this point)
         }
     }
 }
diff --git a/Rubberduck.VBEEditor/ComManagement/ProjectsRepository.cs b/Rubberduck.VBEEditor/ComManagement/ProjectsRepository.cs
@@ -279,13 +279,13 @@ public void RemoveComponent(QualifiedModuleName qualifiedModuleName)
             ExecuteWithinWriteLock(() =>
             {
                 if (!_components.TryGetValue(qualifiedModuleName, out var component) ||
-                    !_componentsCollections.TryGetValue(qualifiedModuleName.ProjectId, out var components))
+                    !_componentsCollections.TryGetValue(qualifiedModuleName.ProjectId, out var componentsCollectionItem))
                 {
                     return;
                 }
 
-                _components.Remove(qualifiedModuleName);
-                components.Remove(component);                
+                _components.Remove(qualifiedModuleName); // Remove our cached copy of the component
+                componentsCollectionItem.Remove(component); // Remove the actual component from the project 
             });
         }