Extend UpdateFromFilesCommand to handle all VB6 files appropriately

Author: MDoerner

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

@@ -26,8 +26,6 @@ public class ImportCommand : CodeExplorerCommandBase
 
         private readonly IVBE _vbe;
         private readonly IFileSystemBrowserFactory _dialogFactory;
-        private readonly IList<string> _importableExtensions;
-        private readonly string _filterExtensions;
         private readonly IParseManager _parseManager;
 
         protected readonly IMessageBox MessageBox;
@@ -48,10 +46,7 @@ public ImportCommand(
 
             AddToCanExecuteEvaluation(SpecialEvaluateCanExecute);
 
-            ComponentTypeForExtension = ComponentTypeExtensions.ComponentTypeForExtension(_vbe.Kind);
-
-            _importableExtensions = ComponentTypeForExtension.Keys.ToList();
-            _filterExtensions = string.Join("; ", _importableExtensions.Select(ext => $"*{ext}"));
+            ComponentTypesForExtension = ComponentTypeExtensions.ComponentTypesForExtension(_vbe.Kind);
 
             AddToCanExecuteEvaluation(SpecialEvaluateCanExecute);
             AddToOnExecuteEvaluation(SpecialEvaluateCanExecute);
@@ -118,7 +113,7 @@ protected virtual ICollection<string> FilesToImport(object parameter)
                 dialog.ShowHelp = false;
                 dialog.Title = DialogsTitle;
                 dialog.Filter =
-                    $"{RubberduckUI.ImportCommand_OpenDialog_Filter_VBFiles} ({_filterExtensions})|{_filterExtensions}|" +
+                    $"{RubberduckUI.ImportCommand_OpenDialog_Filter_VBFiles} ({FilterExtension})|{FilterExtension}|" +
                     $"{RubberduckUI.ImportCommand_OpenDialog_Filter_AllFiles}, (*.*)|*.*";
 
                 if (dialog.ShowDialog() != DialogResult.OK)
@@ -128,7 +123,8 @@ protected virtual ICollection<string> FilesToImport(object parameter)
 
                 var fileNames = dialog.FileNames;
                 var fileExtensions = fileNames.Select(Path.GetExtension);
-                if (fileExtensions.Any(fileExt => !_importableExtensions.Contains(fileExt)))
+                var importableExtensions = ImportableExtensions;
+                if (fileExtensions.Any(fileExt => !importableExtensions.Contains(fileExt)))
                 {
                     NotifyUserAboutAbortDueToUnsupportedFileExtensions(fileNames);
                     return new List<string>();
@@ -142,7 +138,7 @@ protected virtual ICollection<string> FilesToImport(object parameter)
 
         private void NotifyUserAboutAbortDueToUnsupportedFileExtensions(IEnumerable<string> fileNames)
         {
-            var firstUnsupportedFile = fileNames.First(filename => !_importableExtensions.Contains(Path.GetExtension(filename)));
+            var firstUnsupportedFile = fileNames.First(filename => !ImportableExtensions.Contains(Path.GetExtension(filename)));
             var unsupportedFileName = Path.GetFileName(firstUnsupportedFile);
             var message = string.Format(RubberduckUI.ImportCommand_UnsupportedFileExtensions, unsupportedFileName);
             MessageBox.NotifyWarn(message, DialogsTitle);
@@ -165,8 +161,8 @@ protected virtual void ImportFiles(ICollection<string> filesToImport, IVBProject
                 {
                     var fileExtension = Path.GetExtension(filename);
                     if (fileExtension != null
-                        && ComponentTypeForExtension.TryGetValue(fileExtension, out var componentType)
-                        && componentType == ComponentType.Document)
+                        && ComponentTypesForExtension.TryGetValue(fileExtension, out var componentTypes)
+                        && componentTypes.Contains(ComponentType.Document))
                     {
                         //We have to dispose the return value.
                         using (components.ImportSourceFile(filename)) { }
@@ -204,6 +200,10 @@ protected override void OnExecute(object parameter)
             }
         }
 
-        protected IDictionary<string, ComponentType> ComponentTypeForExtension { get; }
+        protected virtual ICollection<string> ImportableExtensions => ComponentTypesForExtension.Keys.ToList();
+
+        private string FilterExtension => string.Join("; ", ImportableExtensions.Select(ext => $"*{ext}"));
+
+        protected IDictionary<string, ICollection<ComponentType>> ComponentTypesForExtension { get; }
     }
 }

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

@@ -4,6 +4,7 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Resources;
 using Rubberduck.VBEditor.Events;
+using Rubberduck.VBEditor.Extensions;
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
@@ -29,7 +30,7 @@ protected override void ImportFiles(ICollection<string> filesToImport, IVBProjec
                 return;
             }
 
-            RemoveReimportableComponents(targetProject);
+            RemoveReImportableComponents(targetProject);
             base.ImportFiles(filesToImport, targetProject);
         }
 
@@ -40,23 +41,28 @@ private bool UserConfirmsToReplaceProjectContents(IVBProject project)
             return MessageBox.ConfirmYesNo(message, DialogsTitle, false);
         }
 
-        private void RemoveReimportableComponents(IVBProject project)
+        private void RemoveReImportableComponents(IVBProject project)
         {
-            var reimportableComponentTypes = ComponentTypeForExtension.Values
-                .Where(componentType => componentType != ComponentType.Document);
+            var reImportableComponentTypes = ReImportableComponentTypes;
             using(var components = project.VBComponents)
             {
                 foreach(var component in components)
                 {
                     using (component)
                     {
-                        if (reimportableComponentTypes.Contains(component.Type))
+                        if (reImportableComponentTypes.Contains(component.Type))
                         {
                             components.Remove(component);
                         }
                     }
                 }
             }
         }
+
+        //We currently do not take precautions for component types requiring a binary file to be present.
+        private ICollection<ComponentType> ReImportableComponentTypes => ComponentTypesForExtension.Values
+            .SelectMany(componentTypes => componentTypes)
+            .Where(componentType => componentType != ComponentType.Document)
+            .ToList();
     }
 }